build: Avoid a Meson deprecation warning
authorEmmanuele Bassi <ebassi@gnome.org>
Tue, 8 Jan 2019 14:46:46 +0000 (14:46 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 8 Jan 2019 14:46:46 +0000 (14:46 +0000)
Using an empty `configuration_data` object to copy a configuration file
is deprecated since Meson 0.47 (released July 2018); the equivalent
behaviour is available by using `copy: true`.

meson.build
testsuite/tools/meson.build

index 53504f9279756399dd88087d1135d49859f079a5..93314fb62858d1c92c55dd1a99b58147dfbc7680 100644 (file)
@@ -7,7 +7,7 @@ project('gtk+', 'c',
           # https://github.com/mesonbuild/meson/issues/2289
           'c_std=gnu99',
         ],
-        meson_version : '>= 0.43.0',
+        meson_version : '>= 0.48.0',
         license: 'LGPLv2.1+')
 
 glib_major_req = 2
index 837e94c6f854f09e33badc62538dbd5e757bb6c8..f0cbb659486104823eeb16fee2e3e42e0b0d5bd2 100644 (file)
@@ -8,7 +8,7 @@ if bash.found()
   foreach t : ['simplify', 'settings']
     configure_file(output: t,
                    input: '@0@.in'.format(t),
-                   configuration: configuration_data(),
+                   copy: true,
                    install: get_option('install-tests'),
                    install_dir: testexecdir)
     test(t, bash,